From d23c74dd447fb268bea88390087a222c14d317c5 Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Wed, 7 Jun 2000 21:39:09 +0000 Subject: [PATCH] Use $PANGO_CONFIG instead of pango-config * configure.in: Use $PANGO_CONFIG instead of pango-config --- ChangeLog | 3 +++ ChangeLog.pre-2-0 | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-2 | 3 +++ ChangeLog.pre-2-4 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ configure.in | 4 ++-- 8 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad861f1304..f14e04802e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Wed Jun 7 15:44:42 2000 Elliot Lee + * configure.in: Use $PANGO_CONFIG instead of pango-config + Wed Jun 7 15:44:42 2000 Owen Taylor * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ad861f1304..f14e04802e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,6 @@ +Wed Jun 7 15:44:42 2000 Elliot Lee + * configure.in: Use $PANGO_CONFIG instead of pango-config + Wed Jun 7 15:44:42 2000 Owen Taylor * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ad861f1304..f14e04802e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,6 @@ +Wed Jun 7 15:44:42 2000 Elliot Lee + * configure.in: Use $PANGO_CONFIG instead of pango-config + Wed Jun 7 15:44:42 2000 Owen Taylor * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ad861f1304..f14e04802e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,6 @@ +Wed Jun 7 15:44:42 2000 Elliot Lee + * configure.in: Use $PANGO_CONFIG instead of pango-config + Wed Jun 7 15:44:42 2000 Owen Taylor * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ad861f1304..f14e04802e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,6 @@ +Wed Jun 7 15:44:42 2000 Elliot Lee + * configure.in: Use $PANGO_CONFIG instead of pango-config + Wed Jun 7 15:44:42 2000 Owen Taylor * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ad861f1304..f14e04802e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,6 @@ +Wed Jun 7 15:44:42 2000 Elliot Lee + * configure.in: Use $PANGO_CONFIG instead of pango-config + Wed Jun 7 15:44:42 2000 Owen Taylor * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ad861f1304..f14e04802e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,6 @@ +Wed Jun 7 15:44:42 2000 Elliot Lee + * configure.in: Use $PANGO_CONFIG instead of pango-config + Wed Jun 7 15:44:42 2000 Owen Taylor * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping diff --git a/configure.in b/configure.in index 5a24288c8f..2185f51898 100644 --- a/configure.in +++ b/configure.in @@ -507,9 +507,9 @@ AC_PATH_PROG(PANGO_CONFIG, pango-config, no) if test x$PANGO_CONFIG = xno ; then AC_MSG_ERROR([*** pango-config not found]) fi -PANGO_CFLAGS="`pango-config --cflags pangox`" +PANGO_CFLAGS="`$PANGO_CONFIG --cflags pangox`" CFLAGS="$CFLAGS $PANGO_CFLAGS" -PANGO_LIBS="`pango-config --libs pangox`" +PANGO_LIBS="`$PANGO_CONFIG --libs pangox`" AC_SUBST(PANGO_LIBS) AC_SUBST(PANGO_CFLAGS) -- 2.30.2